Skip to content

Conversation

@Mab879
Copy link
Member

@Mab879 Mab879 commented Jan 28, 2026

Description:

Review each commit for details.

Rationale:

Fixes #13690

Review Hints:

Run automatus tests for

@Mab879 Mab879 added this to the 0.1.80 milestone Jan 28, 2026
@Mab879 Mab879 added the bugfix Fixes to reported bugs. label Jan 28, 2026
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Used by openshift-ci bot. label Jan 28, 2026
@openshift-ci
Copy link

openshift-ci bot commented Jan 28, 2026

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@Mab879 Mab879 marked this pull request as ready for review January 28, 2026 18:57
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Used by openshift-ci bot. label Jan 28, 2026
@github-actions
Copy link

github-actions bot commented Jan 28, 2026

ATEX Test Results

Test artifacts have been submitted to Testing Farm.

Results: View Test Results
Workflow Run: View Workflow Details

This comment was automatically generated by the ATEX workflow.

@jan-cerny jan-cerny self-assigned this Jan 29, 2026
Copy link
Collaborator

@jan-cerny jan-cerny left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How have you reproduced the linked issue and how have you verified that this PR fixes the issue?

I can't reproduce the issue using Automatus. However, I can see it reproduced using contest, eg. in the daily productization run today.

I have run /per-rule/oscap/from-env contest test in a custom productization pipeline on this PR and the issue still persists.

What I find suspicious in the HTML report from the initial scan is that the test scenario banner_etc_issue_disa_dod_short.pass.sh doesn't seem to modify the /etc/issue file.


elif remediation_type == "bash":
pattern = r'\(bash-populate\s*(\S+)\)'
pattern = r'\(bash-populate\s*([a-zA-Z0-9_]+)\)'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this change needed? It doesn't change the generated data stream. Both old and new version of the shared.sh is matched by the old expression.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change isn't strictly needed but the old regex can get tripped up if the expression ends in )).

@Mab879 Mab879 marked this pull request as draft January 29, 2026 19:22
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Used by openshift-ci bot. label Jan 29, 2026
@Mab879
Copy link
Member Author

Mab879 commented Jan 29, 2026

This might actually might be a contest bug in part.

Around here: https://github.com/RHSecurityCompliance/contest/blob/c1620e15ee5c9d79aebb7c72b4edb50718da238c/per-rule/runner.sh#L89-L91 it seems we need to escape the ' for yaml otherwise the apostrophe is getting interpreted as the closing single quote for the variable.

@comps thoughts?

This PR is still needed to fix a couple issues on the content side.

  • banner_etc_issue_disa_dod_short.fail.sh is broken when using Automatus without edda243
  • The & gets double escaped without e40f1e5. Maybe something we can fix also contest side?

The other two commits (001b620 and 37f4731) can be dropped. Before I rebase this PR let's figure what we want to solve where.

Edit: value giving us all the trouble is ^I've[\s\n]+read[\s\n]+&[\s\n]+consent[\s\n]+to[\s\n ]+terms[\s\n]+in[\s\n]+IS[\s\n]+user[\s\n]+agreem't\.$

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugfix Fixes to reported bugs. do-not-merge/work-in-progress Used by openshift-ci bot.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

banner_etc_issue test scenario is using wrong variable

2 participants